Skip to content

Rollup of 5 pull requests#155199

Merged
rust-bors[bot] merged 42 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-OhWpGAc
Apr 12, 2026
Merged

Rollup of 5 pull requests#155199
rust-bors[bot] merged 42 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-OhWpGAc

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

The Miri Cronjob Bot and others added 30 commits April 5, 2026 05:29
This updates the rust-version file to c92036b.
float test: double error tolerance with imprecise ops on both sides
This updates the rust-version file to bcded33.
This updates the rust-version file to 30d0309.
Add target features corresponding to Hexagon LLVM CPU generations to
complement the existing HVX vector features. These are needed for
gating scalar intrinsics by architecture version.

New features: audio, v60, v62, v65, v66, v67, v68, v69, v71, v73, v75, v79

Each version implies the previous (e.g. v68 implies v67 which implies
v66, etc.), matching LLVM's ArchV60-ArchV79 subtarget features.

Also adds hexagon revisions to the feature-hierarchy test to verify
the implied feature chains work correctly.
fix the bitfield meanings of stacked_borrow item
This updates the rust-version file to 4c42051.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 4c42051
Filtered ref: d09bed217e03a25403a0294a935c52309ae5d084
Upstream diff: rust-lang/rust@30d0309...4c42051

This merge was created using https://github.com/rust-lang/josh-sync.
genmc tests: remove a hack that is no longer needed
WhySoBad and others added 12 commits April 9, 2026 22:01
Fix panic when multiple threads block on same fd
…e, r=adwinwhite

Fix ICE when reporting host-effect errors for const Fn HRTBs in next trait solver

Avoid leaking bound vars into the diagnostic selection path for HRTB host-effect predicates.

Closes rust-lang#151894 .
…atures, r=mati865

Hexagon: add scalar arch-version target features (v60-v79, audio)

Add target features corresponding to Hexagon LLVM CPU generations to complement the existing HVX vector features. These are needed for gating scalar intrinsics by architecture version.

New features: audio, v60, v62, v65, v66, v67, v68, v69, v71, v73, v75, v79

Each version implies the previous (e.g. v68 implies v67 which implies v66, etc.), matching LLVM's ArchV60-ArchV79 subtarget features.

Also adds hexagon revisions to the feature-hierarchy test to verify the implied feature chains work correctly.
…i865

Fix ICE in `span_extend_prev_while` with multibyte characters

Fixes rust-lang#155037

The function assumed that the character found by `rfind` was always one byte wide, using a hardcoded `1` instead of `c.len_utf8()`. When a multibyte character appeared immediately before the span, this caused the resulting span to point into the middle of a UTF-8 sequence, triggering an assertion failure in `bytepos_to_file_charpos`.
Use Vec::push_mut when adding a chunk to arenas

This fixes rust-lang#155148, which may or may not be worth fixing on its own merits, but I think `Vec::push_mut` also makes the code nicer.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 12, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 12, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 12, 2026

📌 Commit bf4d385 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 12, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 10m 37s
Pushing dab8d9d to main...

@rust-bors rust-bors Bot merged commit dab8d9d into rust-lang:main Apr 12, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 12, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154804 Fix ICE when reporting host-effect errors for const Fn HRTB… f922105fc5ebcdc6096cfb8470ad39d04d655698 (link)
#155014 Hexagon: add scalar arch-version target features (v60-v79, … e4854862ad395b9d1230bc14ea35e984140b6570 (link)
#155068 Fix ICE in span_extend_prev_while with multibyte characte… 4fae4a94031320dc3d0e871e40b35804136be5fe (link)
#155161 Use Vec::push_mut when adding a chunk to arenas 0d2ba34843310ea0973f7efea3b3c4df668f8995 (link)
#155197 miri subtree update 27c99d0f8001a77b60f26d55145014d4767f7054 (link)

previous master: 532f8f1443

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Copy Markdown
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 532f8f1 (parent) -> dab8d9d (this PR)

Test differences

Show 13 test diffs

Stage 1

  • [ui] tests/ui/span/span-extend-prev-while-multibyte.rs: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-hvxv66: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v60: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v68: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/diagnostics/const-host-effect-hrtb-no-ice.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-hvxv66: [missing] -> ignore (gcc backend is marked as ignore) (J0)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v60: [missing] -> ignore (gcc backend is marked as ignore) (J0)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v68: [missing] -> ignore (gcc backend is marked as ignore) (J0)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-hvxv66: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v60: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/feature-hierarchy.rs#hexagon-v68: [missing] -> pass (J2)
  • [ui] tests/ui/span/span-extend-prev-while-multibyte.rs: [missing] -> pass (J3)
  • [ui] tests/ui/traits/next-solver/diagnostics/const-host-effect-hrtb-no-ice.rs: [missing] -> pass (J3)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard dab8d9d1066c4c95008163c7babf275106ce3f32 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-apple: 1h 40m -> 2h 22m (+41.4%)
  2. aarch64-gnu-llvm-21-1: 1h 37m -> 59m 39s (-38.8%)
  3. pr-check-1: 25m 5s -> 33m 9s (+32.1%)
  4. x86_64-rust-for-linux: 45m -> 55m (+22.2%)
  5. i686-gnu-1: 2h 1m -> 2h 24m (+19.4%)
  6. x86_64-gnu-tools: 52m 22s -> 1h 1m (+18.0%)
  7. dist-apple-various: 1h 41m -> 1h 24m (-17.1%)
  8. test-various: 1h 53m -> 2h 10m (+15.2%)
  9. x86_64-gnu-stable: 2h 7m -> 2h 26m (+14.7%)
  10. optional-x86_64-gnu-parallel-frontend: 2h 21m -> 2h 39m (+12.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dab8d9d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary -0.6%, secondary -0.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
2.5% [1.9%, 3.2%] 3
Improvements ✅
(primary)
-2.2% [-3.7%, -0.7%] 2
Improvements ✅
(secondary)
-3.2% [-6.7%, -0.9%] 3
All ❌✅ (primary) -0.6% [-3.7%, 2.4%] 3

Cycles

Results (secondary 23.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
23.3% [23.3%, 23.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.0%, secondary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
0.0% [0.0%, 0.1%] 10
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 17
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.1%] 10

Bootstrap: 490.376s -> 489.963s (-0.08%)
Artifact size: 394.22 MiB -> 394.27 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants